From a4bb27616f5315acc0101b3ab6d96b510e10b66c Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 1 Feb 2004 15:36:22 +0000 Subject: [PATCH] Only start sliding when using the new API. Sun Feb 1 16:34:07 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start sliding when using the new API. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktoolbar.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 581635d56e..798a324abe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 1 16:34:07 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start + sliding when using the new API. + Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 581635d56e..798a324abe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 1 16:34:07 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start + sliding when using the new API. + Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 581635d56e..798a324abe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 1 16:34:07 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start + sliding when using the new API. + Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 581635d56e..798a324abe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 1 16:34:07 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start + sliding when using the new API. + Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 581635d56e..798a324abe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 1 16:34:07 2004 Soeren Sandmann + + * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start + sliding when using the new API. + Sun Feb 1 16:03:39 2004 Soeren Sandmann * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 94524f7519..224cb361de 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1513,7 +1513,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget, new_states[i] != NORMAL) { /* an item disappeared, begin sliding */ - if (!size_changed) + if (!size_changed && priv->api_mode == NEW_API) gtk_toolbar_begin_sliding (toolbar); } } -- 2.30.2